Add per-operation locks to FileManager #2147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Without these locks there is a race condition when writing to the operations "main.ftml" file, which happens in multiple different methods, e.g. save_file. When the mscolab application is running in a multi-threaded wsgi server it can happen that two threads try to write to the same file, corrupting it in the process.
ReimarBauer
reviewed
Jan 11, 2024
| @@ -29,6 +29,7 @@ | |||
| import difflib | |||
| import logging | |||
| import git | |||
| import threading | |||
There was a problem hiding this comment.
please import only what we need from threading
from threading import Lock
There was a problem hiding this comment.
Why? I prefer having it namespace'd properly where I use it and it is not like threading is excessively long. Having it just be called Lock where it is used makes it ambiguous if it is coming from threading or from multiprocessing for example.
There was a problem hiding this comment.
good point, we keep it.
We have no generel style for this, usually we use import when we use lots of its methods.
in both cases the module is always fully imported (no speedup by a selection, python parses the whole module).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Without these locks there is a race condition when writing to the operations "main.ftml" file, which happens in multiple different methods, e.g. save_file. When the mscolab application is running in a multi-threaded wsgi server it can happen that two threads try to write to the same file, corrupting it in the process.
Split off from #2100.